From 13815fc4ff695378345201254dbae2de019fd75a Mon Sep 17 00:00:00 2001
From: Reedy <reedy@wikimedia.org>
Date: Sat, 2 Jan 2016 22:47:08 +0000
Subject: [PATCH] Linker::makeLinkObj() was removed

Change-Id: Id0fe255fd65403d02498f5a98292c560d39dd95a
---
 RELEASE-NOTES-1.27         |  1 +
 includes/Linker.php        | 30 ------------------------------
 includes/parser/Parser.php |  3 +--
 3 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27
index 13e15e67f9..a6e626350a 100644
--- a/RELEASE-NOTES-1.27
+++ b/RELEASE-NOTES-1.27
@@ -210,6 +210,7 @@ changes to languages because of Phabricator reports.
 * LogPage::logHeader() was removed (deprecated since 1.19).
 * wfCheckLimits() was removed (deprecated since 1.24).
 * Linker::makeKnownLinkObj() was removed (deprecated since 1.16).
+* Linker::makeLinkObj() was removed (deprecated since 1.16).
 
 == Compatibility ==
 
diff --git a/includes/Linker.php b/includes/Linker.php
index 892587526f..5e035ea471 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -2315,36 +2315,6 @@ class Linker {
 
 	/* Deprecated methods */
 
-	/**
-	 * @deprecated since 1.16 Use link(); warnings since 1.21
-	 *
-	 * Make a link for a title which may or may not be in the database. If you need to
-	 * call this lots of times, pre-fill the link cache with a LinkBatch, otherwise each
-	 * call to this will result in a DB query.
-	 *
-	 * @param Title $nt The title object to make the link from, e.g. from Title::newFromText.
-	 * @param string $text Link text
-	 * @param string $query Optional query part
-	 * @param string $trail Optional trail. Alphabetic characters at the start of this string will
-	 *   be included in the link text. Other characters will be appended after
-	 *   the end of the link.
-	 * @param string $prefix Optional prefix. As trail, only before instead of after.
-	 * @return string
-	 */
-	static function makeLinkObj( $nt, $text = '', $query = '', $trail = '', $prefix = '' ) {
-		wfDeprecated( __METHOD__, '1.21' );
-
-		$query = wfCgiToArray( $query );
-		list( $inside, $trail ) = self::splitTrail( $trail );
-		if ( $text === '' ) {
-			$text = self::linkText( $nt );
-		}
-
-		$ret = self::link( $nt, "$prefix$text$inside", array(), $query ) . $trail;
-
-		return $ret;
-	}
-
 	/**
 	 * Returns the attributes for the tooltip and access key.
 	 * @param string $name
diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index eaecedd5a3..7b4a65074b 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -5276,9 +5276,8 @@ class Parser {
 	}
 
 	/**
-	 * @todo FIXME: Update documentation. makeLinkObj() is deprecated.
 	 * Replace "<!--LINK-->" link placeholders with actual links, in the buffer
-	 * Placeholders created in Skin::makeLinkObj()
+	 * Placeholders created in Linker::link()
 	 *
 	 * @param string $text
 	 * @param int $options
-- 
2.20.1